Bug 574561 – gtk_style_get "shadows" g_object_get

        * gtk/gtk.symbols:
        * gtk/gtkstyle.[hc]: Rename gtk_style_get_property to
        gtk_style_get_style_property to avoid problems for language
        bindings. Pointed out by Torsten Schoenfeld.

svn path=/trunk/; revision=22502

diff --git a/ChangeLog b/ChangeLog
index d02a32084ff4f474183b42079d15688c9c943974..aff84f74893182a921d934a9897bef7ac26dd18f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 574561 – gtk_style_get "shadows" g_object_get
+
+       * gtk/gtk.symbols:
+       * gtk/gtkstyle.[hc]: Rename gtk_style_get_property to
+       gtk_style_get_style_property to avoid problems for language
+       bindings. Pointed out by Torsten Schoenfeld.
+
 2009-03-10  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 574622 – GtkEntry: Should we wrap icon-press and icon-release

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 7ca91181178f74e6f1eae4017fe02c8467e5a855..ad99ab078b0c7ac5c3745723dd047b9759d924bc 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk-sections.txt: Rename gtk_style_get_property to
+       gtk_style_get_style_property
+
 2009-03-02  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.15.5 ===

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 1e4ec4ee8f5eb1d3a385ecd893629a45e9117d83..72051c28fc0d71e53db06123d54666c208ef5a36 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -5779,7 +5779,7 @@ gtk_style_lookup_icon_set
 gtk_style_render_icon
 gtk_style_get_font
 gtk_style_set_font
-gtk_style_get_property
+gtk_style_get_style_property
 gtk_style_get_valist
 gtk_style_get
 gtk_draw_hline

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index b2bb94cd5600743a2347616d52463f1c55f676c3..9e99266f7c99c3579da05dc93f5c433f9712f675 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1279,7 +1279,7 @@ gtk_style_new
 gtk_style_render_icon
 gtk_style_set_background
 gtk_draw_insertion_cursor
-gtk_style_get_property
+gtk_style_get_style_property
 gtk_style_get_valist
 gtk_style_get
 #endif

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 7a8bc0dd7b2b691044aae83301c9d886319e39c1..769fe79143b6170783586fab3f42a0cb88f18f4e 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1741,7 +1741,7 @@ style_property_values_cmp (gconstpointer bsearch_node1,
 }
 
 /**
- * gtk_style_get_property:
+ * gtk_style_get_style_property:
  * @style: a #GtkStyle
  * @widget_type: the #GType of a descendant of #GtkWidget
  * @property_name: the name of the style property to get
@@ -1754,10 +1754,10 @@ style_property_values_cmp (gconstpointer bsearch_node1,
  * Since: 2.16
  */
 void 
-gtk_style_get_property (GtkStyle     *style,
-                        GType        widget_type,
-                        const gchar *property_name,
-                        GValue      *value)
+gtk_style_get_style_property (GtkStyle     *style,
+                              GType        widget_type,
+                              const gchar *property_name,
+                              GValue      *value)
 {
   GtkWidgetClass *klass;
   GParamSpec *pspec;

diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 2b7d66734cd8ec543745799da041a60209f4f504..a6af1779c16a61a34c2ba66d2e944f99586e8a33 100644 (file)
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -863,18 +863,18 @@ GtkBorder *gtk_border_new      (void) G_GNUC_MALLOC;
 GtkBorder *gtk_border_copy     (const GtkBorder *border_);
 void       gtk_border_free     (GtkBorder       *border_);
 
-void gtk_style_get_property (GtkStyle    *style,
-                             GType        widget_type,
-                             const gchar *property_name,
-                             GValue      *value);
-void gtk_style_get_valist   (GtkStyle    *style,
-                             GType        widget_type,
-                             const gchar *first_property_name,
-                             va_list      var_args);
-void gtk_style_get          (GtkStyle    *style,
-                             GType        widget_type,
-                             const gchar *first_property_name,
-                             ...) G_GNUC_NULL_TERMINATED;
+void gtk_style_get_style_property (GtkStyle    *style,
+                                   GType        widget_type,
+                                   const gchar *property_name,
+                                   GValue      *value);
+void gtk_style_get_valist         (GtkStyle    *style,
+                                   GType        widget_type,
+                                   const gchar *first_property_name,
+                                   va_list      var_args);
+void gtk_style_get                (GtkStyle    *style,
+                                   GType        widget_type,
+                                   const gchar *first_property_name,
+                                   ...) G_GNUC_NULL_TERMINATED;
 
 /* --- private API --- */
 const GValue* _gtk_style_peek_property_value (GtkStyle           *style,